Auto merge of #1166 - alexcrichton:docs, r=steveklabnik
authorbors <bors@rust-lang.org>
Fri, 16 Jan 2015 04:17:53 +0000 (04:17 +0000)
committerbors <bors@rust-lang.org>
Fri, 16 Jan 2015 04:17:53 +0000 (04:17 +0000)

Trivial merge